From 70ee3b38284cb6bdf320f43ccb1bd33d4315b26f Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Mon, 17 Mar 2008 11:18:06 +0000 Subject: [PATCH] x86 numa: Fix the overflow of physical addresses. If memory address >4G, the address will overflow in some NUMA code if using unsigned long to statement a physical address in PAE arch. Replace "unsigned long" with paddr_t to avoid overflow. Signed-off-by: Duan Ronghui --- xen/arch/x86/numa.c | 6 +++--- xen/include/asm-x86/numa.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index e80a3995a1..9f983db06d 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -57,7 +57,7 @@ populate_memnodemap(const struct node *nodes, int numnodes, int shift) { int i; int res = -1; - unsigned long addr, end; + paddr_t addr, end; if (shift >= 64) return -1; @@ -286,13 +286,13 @@ static void dump_numa(unsigned char key) (u32)(now>>32), (u32)now); for_each_online_node(i) { - unsigned long pa = (NODE_DATA(i)->node_start_pfn + 1)<< PAGE_SHIFT; + paddr_t pa = (NODE_DATA(i)->node_start_pfn + 1)<< PAGE_SHIFT; printk("idx%d -> NODE%d start->%lu size->%lu\n", i, NODE_DATA(i)->node_id, NODE_DATA(i)->node_start_pfn, NODE_DATA(i)->node_spanned_pages); /* sanity check phys_to_nid() */ - printk("phys_to_nid(%lx) -> %d should be %d\n", pa, phys_to_nid(pa), + printk("phys_to_nid(%"PRIpaddr") -> %d should be %d\n", pa, phys_to_nid(pa), NODE_DATA(i)->node_id); } for_each_online_cpu(i) diff --git a/xen/include/asm-x86/numa.h b/xen/include/asm-x86/numa.h index ee150953bf..90233e07b9 100644 --- a/xen/include/asm-x86/numa.h +++ b/xen/include/asm-x86/numa.h @@ -52,7 +52,7 @@ struct node_data { extern struct node_data node_data[]; -static inline __attribute__((pure)) int phys_to_nid(unsigned long addr) +static inline __attribute__((pure)) int phys_to_nid(paddr_t addr) { unsigned nid; VIRTUAL_BUG_ON((addr >> memnode_shift) >= NODEMAPSIZE); -- 2.30.2